From 75cc32c90b6af991e5c8e5a60cdc3d1c803a44fc Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Wed, 29 Mar 2006 16:39:35 +0000
Subject: [PATCH] Tweak readme.xml to work on new Fedora. Makefile: rm broken
 objects of 'make doc' target. testo & wintesto: test wfff.

---
 Makefile           |  2 +-
 mingw/wintesto.cmd | 16 ++++++++++++++++
 readme.xml         |  2 +-
 testo              |  6 ++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a9677d2f3..034fa87dc 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ dep:
 readme.html: readme.xml 
 	java  com.icl.saxon.StyleSheet $< \
 	/usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \
-	html.stylesheet="http://www.gpsbabel.org/style3.css" > $@
+	html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@
 	cp readme.html $(WEB)/readme.xhtml
 	tools/mkcapabilities
 
diff --git a/mingw/wintesto.cmd b/mingw/wintesto.cmd
index bfad8ce21..a904cd61c 100644
--- a/mingw/wintesto.cmd
+++ b/mingw/wintesto.cmd
@@ -312,6 +312,22 @@ DEL %TMPDIR%\topo.mxf %TMPDIR%\tpg.mxf %TMPDIR%\geo.tpg
 @echo.
 CALL :COMPARE %TMPDIR%\tpg.mxf %TMPDIR%\topo.mxf
 
+REM TPO (NG Topo!) file format
+REM This is hard to test as the datum conversions create minute
+REM inconsistencies in the coordinates. We have four reference files:
+REM tpo-sample1.tpo, tpo-sample1.gpx, tpo-sample2.gpx, and
+REM tpo-sample2.tpo.  These are used to check the conversion to/from
+REM TPO format.
+DEL %TMPDIR%\tpo-sample1.gpx %TMPDIR%\tpo-sample2.tpo
+@echo on
+@echo Testing...
+%PNAME% -t -i tpo -f reference\track\tpo-sample1.tpo -o gpx -F %TMPDIR%\tpo-sample1.gpx
+@echo off
+@echo.
+CALL :COMPARE %TMPDIR%\tpo-sample1.gpx reference\track\tpo-sample1.gpx
+REM ${PNAME} -t -i gpx -f reference/track/tpo-sample2.gpx -o tpo -F ${TMPDIR}/tpo-sample2.tpo
+REM bincompare ${TMPDIR}/tpo-sample2.tpo reference/track/tpo-sample2.tpo
+
 REM OZI (OziExplorer 1.1) file format
 DEL %TMPDIR%\oz.wpt %TMPDIR%\ozi.wpt
 @echo on
diff --git a/readme.xml b/readme.xml
index 5c85ac399..ee64a4790 100644
--- a/readme.xml
+++ b/readme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!DOCTYPE book
-  SYSTEM "/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-26/docbookx.dtd">
+  SYSTEM "/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-30/docbookx.dtd">
 
 <book>
    <bookinfo>
diff --git a/testo b/testo
index 6030fa548..3a24e0b53 100755
--- a/testo
+++ b/testo
@@ -992,4 +992,10 @@ compare ${TMPDIR}/unicsv.gpx reference/unicsv.gpx
 ${PNAME} -i nmea -f reference/track/nmea -o gpx -F ${TMPDIR}/nmea.gpx
 compare ${TMPDIR}/nmea.gpx reference/track/nmea.gpx
 
+#
+# Wfff.
+#
+${PNAME} -i wfff -f reference/wfff.xml -o gpsutil -F ${TMPDIR}/wfff.gpu
+compare ${TMPDIR}/wfff.gpu reference/wfff.gpu
+
 exit 0
-- 
2.30.2